From: Colin Walters <walters@verbum.org>
Date: Thu, 29 Jun 2017 01:39:16 +0000 (-0400)
Subject: tests: Fix assert_files_hardlinked
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~35^2~18
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2013db0527dc2f85ab21cdc37047154a26fd161c;p=ostree.git

tests: Fix assert_files_hardlinked

It was always succeeding because we were trying to stat the inode number, and
failing, and thus getting the empty string for both, which compared as true.

Regression from:
<https://github.com/ostreedev/ostree/commit/74e3581e>

Noticed this while working on
<https://github.com/ostreedev/ostree/pull/974>
and looking at the test results.

Closes: #976
Approved by: jlebon
---

diff --git a/tests/libtest.sh b/tests/libtest.sh
index ee3f4af8..6f33c5b5 100755
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -117,15 +117,14 @@ else
 fi
 
 files_are_hardlinked() {
-    f1=$(stat -c %i $1)
-    f2=$(stat -c %i $2)
-    [ "$f1" == "$f2" ]
+    inode1=$(stat -c %i $1)
+    inode2=$(stat -c %i $2)
+    test -n "${inode1}" && test -n "${inode2}"
+    [ "${inode1}" == "${inode2}" ]
 }
 
 assert_files_hardlinked() {
-    f1=$(stat -c %i $1)
-    f2=$(stat -c %i $2)
-    if ! files_are_hardlinked "$f1" "$f2"; then
+    if ! files_are_hardlinked "$1" "$2"; then
         fatal "Files '$1' and '$2' are not hardlinked"
     fi
 }